DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b
am: f1e276384d

Change-Id: I856ad657b894531f03bc145e033b0cebf4e722cd