Snap for 8505378 from ddd2f63ef75b31cd37ad49725d48361c0ebff798 to mainline-go-documentsui-release

Change-Id: I211fd1b998f1878f1c4f86c1e0dab31ec2912a91