[automerger skipped] [DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control am: 02f38c7284  -s ours am: ea5fd84169
am: 79e2760f8b  -s ours

Change-Id: I25e7011456e1611c84cdad19f6c576dde1842077