code review comments addressed, but for one failure in LocatioUsageTrackingTest