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

Change-Id: I6d095be566cc58c27b9d5246b5f92b749d5cbc43