Merge "HWC2: Add const and alphabetize" into nyc-dev