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