Merge "Unhide framework constants and renamed errorType to type."