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

Change-Id: Ia1899036cb0c1f0f63b7f1cd97d6f1418c0e5614