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