am d17a26bc: am 93e5b8df: am 3c084241: Merge "Fix name-suffix rotation crash, for real this time" into lmp-dev

* commit 'd17a26bc1d8363c707c23821fb78ac18ed23a1f4':
  Fix name-suffix rotation crash, for real this time