Snap for 8564071 from a3a652d3d73bb8b135c4c9d9e33541f130f984a3 to mainline-documentsui-release

Change-Id: I126f4673fa4a6d9bb30dddba179a5f20919315a9