Merge "msm: msm_bus: Add braces around suspiciously indented code" into msm-4.9