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

Change-Id: If7b4af9bec9440cdfe5d1fc202248fcb7da95fa1