Merge from android-5.0.0_r2.