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