Merge \"Always apply config updates.\" into mnc-dr-dev
am: f437bd068c

Change-Id: I899b923c075a5f3351c4791a23a94adf123d1247