DO NOT MERGE - Fix demo mode reset notification
am: b189aa6cf8

Change-Id: I0a96270ba9f8c52339af500b7fe4d8df0e7f4254