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

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