Switched around author names - I'm the main author now

Change-Id: Ifda6cb85a8ea0cae2d24e98f6e39706dca4b4079
Merge "Switched around author names - I'm the main author now"