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

Change-Id: Ieae0bba706180e42524eb3d8205dca4105dd6b76