Snap for 10453563 from c3cc2de2bf0606264864087bba4d58eae60dea68 to mainline-documentsui-release

Change-Id: I098caab8e8fbd21bfd14487946006a574b3dd69a