Integrate updated query editing asserts from mkoser.

Change-Id: I578db2b6e4adb975e5acca8681ea58ebd058a676
8 files changed