Android 5.1.1 release 36
merge in lmp-mr1-release history after reset to eeb28851420af3bbf5a7d895942c2267de3133f8