Merge "Add config_demoModePassword" into nyc-mr2-dev