Merge "Add support to hide LTE+ in UI." into nyc-mr1-dev