Snap for 7080740 from 171680f19361930fe731635442e1d4a0d43b9cd6 to mainline-documentsui-release

Change-Id: Iccfb709f79f4f37256053af2c1812d49dee96107