Merge "Remove sendMessage inside EntitlementManager"