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