Android 5.1.1 release 35
merge in lmp-mr1-release history after reset to lmp-mr1-dev