Android 5.1.1 release 3
merge in lmp-mr1-release history after reset to 4839c9acf4e935dab0b3de3fac0e315d00c3a369