Merge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video