am 42ea0db8: (-s ours) [DO NOT MERGE] Adding constants already available in burnaby

* commit '42ea0db8892020cc07046979892460bad55d2b45':
  [DO NOT MERGE] Adding constants already available in burnaby