Merge "disabled passthrough mode for Configstore" am: 7f8b76a322 am: 37b5d80abf
am: 7af7140958

Change-Id: I98bb865ed1b5a28a4e57a4da849ef2db685f032c