Merge "Fix for mode ambiguity and thresholds for AEC test"