Merge \"Merge \\\\\\"Always apply config updates.\\\\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21 am: 005394cd01  -s ours am: 7e2ae2b143 am: 10a4bae9c8\" into nyc-mr1-dev-plus-aosp
am: 4ac2aca704

Change-Id: Id6ef2e7324de4adaa3cf26cae076b21285287877