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

Change-Id: I46c7e5876f3def55489ff5103eca8a22bfcd9b6d