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

Change-Id: I89f9818437ccac91465cd2132777e8cc480fd29b