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

Change-Id: Ibe6a25fcae5d61b027ce67a265588c19f2fc361a