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

Change-Id: I399bb4df95049586c2a4fe6f33f816eb171e58d4