am 7839867c: Merge "Update to use real L codename." into ub-camera-glacier

* commit '7839867c4c6eb837d5e7c1c5851741d4933f5fb1':
  Update to use real L codename.