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

Change-Id: I46e25ada0c08cd67bf8c3bf20587e34d656769a6