Snap for 7478028 from 0f0b21f256c1cb82e914d32b5c554bdb4c98868d to mainline-documentsui-release

Change-Id: I95d422a2283771ee42c80605ab28916a8c6b8edd