Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

Change-Id: I255db0e1b1def966a79acf865a23ba1ef5261831