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

Change-Id: I73f581958753734eb2d8cd0907ff03c3865ff0e9