[automerger] DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot am: b5e7bbe5b8 am: 1bb102e37d am: 1c348395f5 am: 26fda93676 skipped: cf76183e6c am: cf81345649
am: 94029593c4

Change-Id: I816c914fd79f9589efa0e6b587649cd6264113bc