Reducing work on configuration change (Part 1)
am: 670ea71

* commit '670ea71f1b4ae59a0cd6608ae44b0fb78a1144c4':
  Reducing work on configuration change (Part 1)

Change-Id: I42fad93826036aef60bbc2d182c13840bae57fa4