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

Change-Id: Ib01ae4aae3f690c800900932d5a72c035012f65b