Android 5.0.0 release 6
merge in lmp-release history after reset to 66f0d93c265657e17c7a1ddd74beb61070a8df69