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

Change-Id: I6ac861d1a4bb7ab30597ca55abab7b26348724df