Merge "configs: fastforward msmnile_au configs for Q"