Merge branch 'android-5.0.2_r1'