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

Change-Id: I1ae19fa4df749682432ec8fbc22f7fc38015ed7b