am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev

* commit '38000b0ffd1080e6e8bd9b0607c8916aa9bd0a1b':
  Manually merge QC's change for SUPL_ES.