Merge tag 'android-5.0.0_r5' into lp5.0