Merge "msm: adsprpc: Incorporate coding style comments"