Merge "Add config value to restrict channel for ACS"