DO NOT MERGE - Fix demo mode reset notification am: b189aa6cf8
am: 38d2c0e6bc  -s ours

Change-Id: I9dd5281575fe82795dbe4d8b1fa51e9b9f021d7d