Merge "Fix broken SystemApi docs." into oc-dev
am: bbc764e83a

Change-Id: I06469171e4926ecc82d3685360b8cb423f6231c3