Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f
am: 21c4a58435

Change-Id: I3d4e666268ac37f41c6d94e10f5e5e1f2928ef7f