Android 5.0.0 release 5
merge in lmp-release history after reset to 75da0247b5c15f0b08cac4844e5fe64c7d5015c5