Merge "More auto-doc work." into oc-dev
am: 6bc03748a7

Change-Id: I71f5f408abfa0d7cdf71711bb1bbab63341989c3