am e678b41c: Merge "Fix setName use-after-free" into mnc-dev

* commit 'e678b41cdb56847c094260607ea39aea4abb808e':
  Fix setName use-after-free