Fix odcpi feature when Location is off in settings am: 7fcd884a21 am: 33f9df339a am: bd44f3cfbf am: 365ffc4707

Change-Id: Iea51b3d9852534169e64f53090e179a46caf7a5f