Merge "Move proto messages from enums/ to message/" into sc-dev