fix carrier dependence

Change-Id: I983a353e21fc4ff64c1d04981795f78afd3c1d71