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

Change-Id: I22283c4430f2dae9123e95b5c38ef7301c0441df