Change-Id: I63bd76ec4e44251b7e06ad6fc8aa5a3372104656 Fixes: 37323694 Test: Looked at generated docs, verified correct