Snap for 7478028 from cc1945d397e61b1967bef5f5e11ebff6b303e68f to mainline-documentsui-release

Change-Id: I086127857e554907dcb0408018d623b93aaedf8d