Merge changes from topic "am-bd8937297d1b4d4295c6ad984c3fd2c7" into oc-mr1-dev-plus-aosp

* changes:
  Merge changes from topic "tz_catchup1" am: 4e0a02ce1f am: 60bc26e3e2
  Be more explicit about users am: b755291e65 am: 8f57711f2f