Merge "cherrypick Change-Id: Ic363e69d1cb544520a1ca04c53ff45c552e4947e docs: fix issue 5048214 and clarify some variable names"