Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into...

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef  -s ours am: d9c81559  -s ours am: bf1c88f3  -s ours am: c1a0e6db  -s ours am: 20756a97  -s ours am: 9394305c  -s ours am: 9690f889  -s ours am: 32c6684a  -s ours am: bcc2e70d  -s ours am: 6b398f72  -s ours am: cda0f977  -s ours am: 339dd0a4  -s ours
am: ee718b32  -s ours

Change-Id: Ie343d1a241ef0554eb844aa51e115dc6c340148b