am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
  Update to use "real" L codename.