Merge "SV used in fix satellites are not updated for B2A-Q"