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

Change-Id: Ie6a8d8e3c81ffa2754ec44dc57876a37fcd796b1