ObjectiveC migrator: Fixes public buildbot failures,
in my previous patch which was reverted in r187657