Merge "Support another new intent for mainline module intent" into rvc-dev