Merge "msm_shared: gsbi cleanup"