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-mr1-dev am: 3ced78bd am: aec526f7 -s ours
am: 14e38a8b
Change-Id: Ib5e1e997168d33810e36510bebe6783382211059