am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'fcc33af67985b14916f6ff5f291248468dca1377':
  Export provider
  Fix directory provider authority name & export provider
  Make sure we send attachments when not smart-forward
  Fix problem w/ all-day event in invitation