Merge "Even more auto-doc work." into oc-dev am: 880f4f4cc2
am: 9652eef0b2

Change-Id: I96c77c62b6ee3b5acaa45e116d35c7114797a0b8