Merge "platform: msm_shared: Update rot calculation"