Merge changes from topics "cts-from-user", "zen-origins" into main

* changes:
  Expose AZR-related methods with fromUser as @TestApi
  Properly distinguish origin of Zen Changes