* commit '9278d3216837ad45eae13b87f04f050acb4ddafa': cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642
* commit '9278d3216837ad45eae13b87f04f050acb4ddafa': cherrypick Change-Id: I7a0fc4863c547bd40051437a834bb50373415abd docs: fix bug 3216642