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

Change-Id: Id7e66ad854e7c0b530371acb0d3b8163ca7f6457