Android 5.0.0 release 3
merge in lmp-release history after reset to 60b42150472edbdc93cafbeadebefd40cbb87639