Android 5.0.0 release 7
merge in lmp-release history after reset to b799cb877d19e757cfc8657a547166b89e5614e4