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