Snap for 8564071 from cf329c0891d9be50679a3240cdf758e8e3eea104 to mainline-documentsui-release

Change-Id: I5d09b951846ba50574cd0d21283662b30559928d