Merge \\\"Always apply config updates.\\\" into mnc-dr-dev am: f437bd068c am: 2a44859c21
am: 005394cd01 -s ours
Change-Id: I45ff9548eb6091ecbcf9e45e0fddb2cbcebc889d
This commit is contained in: