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

* commit '10484dfe2e431619866b3920368d62c84892d3aa':