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