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

Change-Id: I7dc022c647c66cb5a6c1435808fce85099179a85