DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours
am: a3685e4bb5 -s ours
Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14
This commit is contained in: