am 170b26ba: Merge "SDK only: add markup for use in documentation." into ics-mr1

* commit '170b26ba32bd86df929a8a27fefde91a114f3831':
  SDK only: add markup for use in documentation.