Merge "Remove configuration of com.android.geotz module" into sc-dev