am ebb2a66b: am 0cd27191: Merge "Remove reference to CODENAME from compat code." into ub-now-porkchop

* commit 'ebb2a66b79b2761ed29f2f8a3140217c126e448b':
  Remove reference to CODENAME from compat code.