Merge changes from topic "presubmit-am-45adabae3e88471dbe2f4b024b6cd8ad"

* changes:
  [automerge] Add unit tests 2p: 9103b7dbfb
  Add unit tests