Merge \\\\"Always apply config updates.\\\\" into mnc-dr-dev am: f437bd06 am: 2a44859c am: 005394cd -s ours am: 7e2ae2b1 Change-Id: I17b031b52b826bb288090bc737a41a8863cbde95