Merge outbox and outbox-bundle

https://trello.com/c/eEOdcUfo

Merge outbox and outbox-bundle

Change-Id: I9563f2c316a8f705558179499de255ee7a9b23bf