Merge "Add LTE+ and update 4G+ icons" into nyc-mr1-dev