Merge tag 'android-5.0.2_r1' into lp