Track Apollo

Already forked and pushed to gerrit
Merge "Track Apollo" into du44