Merge "HWC2: Add const and alphabetize" into nyc-dev am: f588e0b
am: 8efe910

* commit '8efe9105abc579413e62cd3aa29229b6bb049cbd':
  HWC2: Add const and alphabetize