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