Merge \\\"Do less work on configuration change.\\\" into nyc-mr1-dev am: aef7b7242e am: c8a5f3770a
am: ae12541cae

Change-Id: I169f911155e9d0e1ba8bd89fb5fd630515879149