Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

Change-Id: I52ad414c6c92cfa40987ca6bfca9a4ee2d134260