DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours
am: 3a09dac9c4

Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533