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

* commit '626457486cbf5e40c77019f965755ae30b72af22':
  Manually merge QC's change for SUPL_ES.