Merge "cherrypick Change-Id: I86e18c9e5d6dd540d1d49ce6b9c038aed3b986b0 fix doc break"