Track Apollo from Omni

Change-Id: I1d2324bbe197717b0a11caa69207f3e7bcfc4c12