Merge "Merge "Add comments to messageId, subMessageId and data" into rvc-dev am: dae05e10 am: a34b687c" into rvc-d1-dev-plus-aosp