Fix odcpi feature when Location is off in settings am: ca948af6d6 am: 01c4c76c90 am: dffee99f59

Change-Id: I45eedc896743c44629314d6c8bdc1fd6d7a8035d