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

Change-Id: If2f27dd775d4d5d543d23d10dcce10bc1bc4f51a