DO NOT MERGE - Ask device owner for master clear in demo mode am: a22c8345fa
am: 0a982f39c2
am: 26b413d7a4
-s ours
Change-Id: If46907f6fe00b7b87ada7135d3cd53e5a95cbfd5
This commit is contained in: