Merge "Enable support of Automatic Channel Selection"