Updating androidServiceModule and apTrackingModule to new design.