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

Change-Id: Iebb2df13ab008669ed7fde33085a595e200ee251