This is a follow-up patch to address documentation nits from the patch: I63fe91ee4f9ac3021bcfd9a4a378af56af800fac Change-Id: If3e4ac1fcc3d3be1508086db122a11df71e7e3e6