Merge changes from topic "presubmit-am-91cc0df2b68645199056224704534e0b"

* changes:
  [automerge] Include compared values in assertion messages. 2p: 970dd9770a
  Include compared values in assertion messages.