Merge tag 'android-6.0.1_r22' into develop

Android 6.0.1 release 22