Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev am: 64a16be2ba
am: 1ee8470c0a  -s ours

Change-Id: If308100e44ef4e8cc7324a66d6a73db0378bde50