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