Merge "Use updated override config to notify listeners." into pi-dev am: 9036d61647
am: 653697a0de

Change-Id: Ibc6d8babfad53a1e1b0636466d3c8575fffea918