Merge "Do not call RecoverySystem with DPMS lock held" into nyc-mr2-dev
am: 85ecba4423

Change-Id: Ia7b80ed106af9a1aa065230ab4bdae92ef0cba82