DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa  -s ours

Change-Id: Idba1b64f82a297c5617073e29c5f07902ca69177