Update a few stragglers following D41.

Test Plan:
Successfully ran new Gmail and Google contacts syncs; ran unit
tests.

Reviewers: kav-ya

Reviewed By: kav-ya

Differential Revision: https://review.inboxapp.com/D43