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

Change-Id: I341af561c4e664f19e4c24d176ea33ef063b3314