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

Change-Id: I5dcb81009528c1416f7b8b3bb3c05d19a022e3c0