Snap for 10453563 from a2233774e5d7423a4d95383e371cd7b5cdd4f500 to mainline-documentsui-release

Change-Id: Iddda6e96ed65e1173e62be17be4dcb95e69dee8a