Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

Change-Id: Ia3a5af156b44de7fa5c264e1549c0364c6a54645