This change enables the QueryFormatAfterSettingWorks. Change-Id: Ic868011a36a6c86c8646880246cd5b6960a13364