Android 5.0.2 release 3
merge in lmp-release history after reset to 2344717512130b1c2778320fa48c95e37abd8832