Merge "Add config_demoModePassword" into nyc-mr2-dev am: ee3af13cf2
am: 8ec23fe5b5

Change-Id: I30494333b8db8d7d91a27bf7d9e8aadb0766b542