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

Change-Id: Ife1347cf251524f7975124304369d5e2e80340b5