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

Change-Id: I166f8dc68e18953cb9d46b414d7b27d66d0465a5