Merge "Snap for 7478028 from f0fe689751827a6cd8f71bedeae7c9a927719990 to mainline-documentsui-release" into mainline-documentsui-release