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