Android 5.0.0 release 2
merge in lmp-release history after reset to 30b9fde05775317ef61862ef2f919f9ece40b8fd