Merge "msm: rtb: Log the context id in the rtb" into msm-3.0