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

Change-Id: Ifbbd5754eb88f661ec351bc5ea179d3d47f2beeb