Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev