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

* commit 'bc2055549d3218faef582f341491233c62e99be7':

Change-Id: I61a044b21a88bbb605e9accd3dbf8bed1d9c5070