Merge "Update to use real L codename." into ub-camera-glacier