This moves Eeshan's work from his edengci branch to staging, to go with the new git workflow.