Merge changes from topic "presubmit-am-8c5e3408651c44d7a82012c095d89c46"

* changes:
  [automerge] Add unit tests 2p: 995c199f4f
  Add unit tests