Merge \"Add support to hide LTE+ in UI.\" into nyc-mr1-dev
am: 0a39c8f1c9

Change-Id: If478db38c62e775a161e8b7995df1377296e7a9d