Send all ariel's mail to Google Apps

Ariel seems to have the same issue I have with different primary
account names on the two systems.

Change-Id: Ib4e7b9ef50518237ef74e4832f9662a54f675602
Merge "Send all ariel's mail to Google Apps" into production