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