Merge changes from topic "presubmit-am-2ace16f3cbfe4af0a24473820ab02806"

* changes:
  [automerge] Add dir name to assertion message. 2p: 3bdf8efe54
  Add dir name to assertion message.