Merge commit '0ceb80f37a2e8211d6f1947d79a6f9f646c61fe2' of sso://googleplex-android/platform/packages/apps/DocumentsUI into HEAD
Change-Id: I357c103ed08a6049f070a29deaa3e79985b52b04