Merge "disabled passthrough mode for Configstore"
am: 7f8b76a322

Change-Id: Ib7e37189c90752d8c536cb2e5bdf0a2518865981