Merge "Changing SUPL_ES=1 for SUPL end point control" into pi-dev
am: 14fad0c6ca

Change-Id: Ie8fd04adbd1739e108afabc365af72c29a53ebb4