Merge "overrideConfig API did not notify platform correctly"
am: f378a4017c

Change-Id: I447d97ab27e708a5957ffd5f7465ea3dfe3b0869