Android 5.0.0 release 1
merge in lmp-release history after reset to ba0345a85ca915190f3faedddd3b4d1206f32d3e