Merge "Manually merge QC's change for SUPL_ES." into lmp-dev