Snap for 10453563 from 624004eddc53bc7af079355587d2a31d29e7d374 to mainline-documentsui-release

Change-Id: I5cbde457e538a7e047f7446210e945ddd51e3928