Merge tag 'android-5.0.1_r1' into HEAD
-original commit a4ccf640daea53c814f217395add55944e6a7b05

Author-rmcc

Change-Id: I2f13d1f55d2f2e2f1b7fce51fb99444be461fa32