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

Change-Id: I1462c5cc78001f6be749f518c861c7fcc771f90f