[automerger skipped] Merge "Workaround to hide LTE wording for O2" into pi-dev am: bb79ddf83d  -s ours
am: dbec4e692f  -s ours

Change-Id: Ie5f672caa7bb56e51a82c9834ace1b18a270a2ff