Merge "set config_enabled_lte to true by default" am: 345ae12807 am: 3d3c626e11
am: 18568a7c78

Change-Id: Icd649dd42fb087cdde60f947c7f4763ad7ec79a9