Merge branch 'android-5.0.2_r1' into lp5.0

Change-Id: I5f0d458b96e07d9dd725a13a60de1c885942e5d6