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

Change-Id: I2af583aaac713edec38d75fe168fdc8a4f662bd3