am 047183e0: am 7fa98c67: Merge "Allow calling package to attach files from its data dir" into ub-gmail-ur14-dev

* commit '047183e0458dba621d0467b2f7338ffa1ed3a793':
  Allow calling package to attach files from its data dir