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

Change-Id: I5c187df38b4fd875c1032be19e05930c92292fc1