Merge "Add error code for entitlement check failure"