am 400b6232: Merge "Update Z documentation to avoid hidden API"

* commit '400b6232090c9e620bf4eedd34c8ceadb00b2237':
  Update Z documentation to avoid hidden API