Merge "[ConfigStore] Slient log spam." am: 925f06e87b
am: 30e7ab464d

Change-Id: I71cf5a11e558455f4a19e835d0ffb81417878311