Merge "Update to use "real" L codename." into lmp-dev