DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed6119 -s...

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed6119  -s ours am: 051f0170  -s ours am: a3685e4b  -s ours am: 3f7ed73f  -s ours am: 64e2b4f8  -s ours am: 170f2b9e  -s ours am: 2b01e24b  -s ours am: 6b1fd0f9  -s ours am: 56be9656  -s ours
am: e3d5ea3a  -s ours

Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf