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

* commit 'eee53e6d3912220abeea3dfd8b305c051b43eb4e':