Merge "Fix raw references to Promise"

No match.