Android 5.0.0 release 4
merge in lmp-release history after reset to dcdc99b01b2fb8a72297f3f02c4e4b23e1eac825