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

* commit '5f2a520f0cd47b274bdf809d7b665c956c2717ed':