Merge "defconfig: msm8610: Enable USB-UICC support"