Track our own Apollo

Change-Id: Ic3682d40866c4e6b7ac91e0115f1655ace44d0c2