Merge "Fix documentation bug that breaks generation" into pi-dev
am: 353a9bc4bf

Change-Id: Ic17fca864e9e5ff84f03916617468bab86c01b49