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

Change-Id: I60bc33931de9c8f460d4f527d848910988318a27