Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36  -s ours am: d9c8155943  -s ours am: bf1c88f34e  -s ours am: c1a0e6db4c  -s ours
am: 20756a97ea  -s ours

Change-Id: I976532a5bc3d21d637da69e2f508eeb532ec1996