Snap for 7277594 from 3ade81c3c8930c30ecb8dac2f360b9177a9a1317 to mainline-documentsui-release

Change-Id: I84d23aa9c7212b851d9a9df55960732dd140a2d1