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

Change-Id: Ie4473df7f74979dfea872ca26ff163d4a2854ae2