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

Change-Id: Iad34fafce9d9bdf8a4cbdc76a3f1d16d2d565c80