Merge "msmsteppe_au: modify the device ids for HFP usecase"