Merge "Enable PasteInto when right clicking on directories." into nyc-andromeda-dev
am: 3c4968c1e4

Change-Id: Id5ca4f800b8cc4c5872ed469f9c4a46674d064f1