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

Change-Id: I27a89bac34e54f8ed06a8a7c7952348d7aa64da1