Merge tag 'android-5.0.2_r1' into HEAD

Android 5.0.2 release 1

(cherry picked from commit 705c2df9bda214108a6e9bf928b87dcee5eea2ee)