Merge "slimbus: Add braces around suspicious indent" into msm-4.9