Merge "Fixed class and subclass IDs sign extension on byte->int problem."