cherrypick Change-Id: Iaada8d42f97786d393743cd7fc3011da1d21f22e
docs: resolve issue 5044273 and fix markup error

Change-Id: Ic028292245c14cca218ea9ac771f292254577e7c
2 files changed