Merge "Changing SUPL_ES=1 for SUPL end point control" into pi-dev