Snap for 8736029 from 3194ed7fc8b659d00e0bc363f51bab8f686fc4e2 to mainline-go-documentsui-release

Change-Id: I8a0e7b2aeb31e852ac55eb2df62ff1e4b2ceb073