Merge "Update hw mode after acs selects the channel"