Fix odcpi feature when Location is off in settings am: 7fcd884a21 am: 33f9df339a am: bd44f3cfbf

Change-Id: I113a254241c432aac09beb3ade93634862d4c2f4