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

Change-Id: I90badd6bc1069e015331c697bbde912465e918c1