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

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