Merge changes from topic "presubmit-am-7329b2c1a2354fc9ac051f7ef99fd65b" into tm-dev

* changes:
  [automerge] Re-enable tests 2p: 6b11a30926
  Re-enable tests