Test: N/A. Doc update Bug: 109666939 Bug: 113052379 Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c Merged-In: I2bd176a7f5ada755c8a79201d142a98131e2e82c (cherry picked from commit 6c73e409)