Merge "fsm: Enable UIM interface" into msm-3.4