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

Change-Id: I1af1ef8a59737cbf292fa0fd88f662cb5a416d71