Fix odcpi feature when Location is off in settings am: ca948af6d6 am: 01c4c76c90 am: dffee99f59 am: 53b4362a4d

Change-Id: I3c9e171e5d80f18a85e72c31bf51c2b9d2c6b109