Merge branch 'ion' into p-ti-android-3.8.y-video