* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37': cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882
* commit '6390fa6bdf50a3bf10cd6c54328397fe709f7c37': cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: fix bug 3273882