Merge "DocumentsUI: Fix some test failures in DocumentsUITests" into pi-dev
am: 4f8fa7a7e3

Change-Id: I6d93b744b2b2461f58f6cb8d7048b5d91c2be54b