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

Change-Id: I77a55b4ed47b5eeb174b99a662e32fb593d7ec10