[automerger skipped] Merge "DO NOT MERGE - SUPL ES Extension - Safer Init and Not After Boot" into oc-dev am: 809231680f am: 21c4a58435
am: 499b803c52 -s ours
am skip reason: subject contains skip directive

Change-Id: I4771454a5cdfdd6641983f438139a97f216cec5c