[automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev am: 598118ffe1
am: 17bf9f9e42 -s ours
am skip reason: subject contains skip directive

Change-Id: I463b9f8c1608528810c757f5fd4d4de3dc250857