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

Change-Id: Ie420c0a006c5681c4055e674a7741fe87ded6680