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

Change-Id: Ie3c7742eca5b729edfdf42009eeaa80320c625c9