Merge "platform: msm_shared: Fix for msmzirc bring up"