Fix odcpi feature when Location is off in settings am: ca948af6d6 am: 01c4c76c90 am: dffee99f59 am: 53b4362a4d am: 74ef5ab107

Change-Id: I36a2d6348636be4025d380b02c0eb64da2a65f02