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

* commit 'f588e0b3b9ab3b07b8833bccf9ab8a870d3943df':
  HWC2: Add const and alphabetize