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

Change-Id: Ia451468374e885e0c02a7adfd5a6032165d121df