Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8
am: e574888a60

* commit 'e574888a609b7a36c059fab4cdcfab90fe948f9c':

Change-Id: I99ba69682f763583611b6006db22f5d7c43811cf