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