Merge "msm: msm_bus: Misc fixes and code clean up"