Snap for 10453563 from e6157479ed9c9474a58577364ad9db8f079f3f3a to mainline-documentsui-release

Change-Id: I3459c5f601c63ec352f7a6a37e49b610ff956e7a