Merge "Fix AAE activity blocking." into nyc-car-dev