Snap for 10453563 from 13df7e03341beb36b2038368930eb082a436c010 to mainline-documentsui-release

Change-Id: I13ead2fad6a93dd07e2bf09c7ee8376132b7c56f