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

* commit '7fa98c67d36ca68b19a7f1140fa0b79a3ab7b991':
  Allow calling package to attach files from its data dir