am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
  Put in real "code" (aka marketing) name.