DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa
-s ours am: be3c8bf442
am: a2075d2eb4
-s ours
Change-Id: I5578eb0b5ee3aa2eb86872ba2443566ddd6e0ec0
This commit is contained in: