Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into pi-dev