Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 70cf529d14

* commit '70cf529d14e2d1471b27883d028c927531d363a3':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: Ib3e1e7d2266652235cbee106561e26737ca243b7