Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 65e8a2d330
am: 22e3fb6074

* commit '22e3fb607435e2c24c9d4430a2c4b8d693e3cb80':
  Messaging doesn't allow sharing of its own files

Change-Id: I61a467aa2debeb9a7feb10e753be8b472bca1195