Do less work on configuration change.
am: 494f0dedb2

Change-Id: I6e23ab27d42c7b2dd67f5570e67656b147b3ed71