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

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