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

* commit 'e431703711bf883b139f41fdd21ecf3c34b79ea8':