Android 5.0.0 release 6
merge in lmp-release history after reset to 772e12cfed81754a9fd890be7bc77bc602a549b5