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

Change-Id: I5338bfddee656a10b470e83f1b379d941923859e