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

Change-Id: I40ec2e33e856e1071ce1a2d97c494a7a5ba6cb84