Fix up Apollo compilation

Change-Id: I78fd7eb5f17b3626b2e81588681111c45f078ac0