Merge "configs: fastforward msmsteppe_au configs for Q"