Android 5.0.2 release 3
merge in lmp-release history after reset to c891e24073830e07ba7373dee554ff2c70e1d313