cherry-pick from master : Reference doc fixes
am: a78bc8ffe3

Change-Id: Ief979c6a4301b7f175a315f9183ca029648a79b5