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