Merge changes from topic "presubmit-am-907fdfc5a90b43a49557602baf5c6723"

* changes:
  [automerge] Add unit tests 2p: e62ae09e52
  Add unit tests