[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot...
[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5 am: 1bb102e3 am: 1c348395
Change-Id: I5c7df1fd86ece1f84fba51250568a0d049b591f9