Snap for 8564071 from eeb16f6eac71f26869b8e85d27fa5a7162f323d3 to mainline-documentsui-release

Change-Id: I5eb02aa1429e1e1fd08a398335cd7e764852338e