Merge "Change default of hide LTE+ config to true" am: 3e478bf55e
am: 1e35170bfc

Change-Id: I3d30f7903a20e94bd4f6aa959091a76323d99831