Merge "DO NOT MERGE: Disable drag n\' drop in DocumentsActivity." into nyc-dev am: 6e685dc3c5
am: b6f30bae48  -s ours

* commit 'b6f30bae48ef955b75c3568055c3773600232cd0':
  DO NOT MERGE: Disable drag n' drop in DocumentsActivity.

Change-Id: I4428063e93379fdfdf280cb627dc94dfc7045ef0