Snap for 10453563 from ace296d7654032423ceb3d7f5c3305aa21733ff4 to mainline-documentsui-release

Change-Id: I9588fe46f90b7e2081e5d402b59be35752b993ca