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

Change-Id: I7638c80d5dca146a74437a2e063dfbd516c9e675