Merge "Align saved query text" into rvc-dev am: 684466b941 am: 461382c231

Change-Id: If5095b51d7b1597d725f27d90b7fa389cc98c29b