Snap for 8736029 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-documentsui-release

Change-Id: I45642a8c02dd1a459a399f0f7fbe224d0e782be6