Merge "Remove sendMessage inside EntitlementManager" into rvc-dev