Snap for 8736029 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-go-documentsui-release

Change-Id: Ief6dbacb7df3c8ac424f1f7e983948ad417965cc