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

Change-Id: Id4e2d35e94b6f09ade5821aaec9705ba0a4f137e