Merge "Updated notification text when copying, moving, and deleting files and/or folders to refer to any combination as items." into nyc-andromeda-dev
am: 8e845544

Change-Id: I46dbec0ddee67dbf5d32a19de5df8300d797cbcb