Merge "hal: MS12: qap test app update"