Merge changes from topic "presubmit-am-b36d3cf7498841d4a684ea497f8526c1" into tm-dev

* changes:
  Document the QNS behavior
  Partially revert ag/17294635