Snap for 7277594 from 415ead8f180142493fae4fe7744cd5fc9a3979ec to mainline-documentsui-release

Change-Id: Ifb59391df8983da069f154fbc1b377e79c0c63ed