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

* commit '0c7532ff8562aa3bc2ba29122fa173151e2bb169':
  Fix setName use-after-free