Snap for 8564071 from 248d7c742809ce1cbde1c4e6163d347e1feb274b to mainline-documentsui-release

Change-Id: I9a9e10781020b1bcf02938858966ffa6df697b14