Merge "platform: msm_shared: Fix false switching of guid."