Merge remote-tracking branch 'origin/API11' into tizen_8.0