Merge \\\\"Always apply config updates.\\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21 am: 005394cd01  -s ours
am: 7e2ae2b143

Change-Id: I17b031b52b826bb288090bc737a41a8863cbde95