Merge "slim_msm: Rectify physical address type"