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

Change-Id: Ib6342e8bf188fc82800d4aff5354c37d87424ed1