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

* commit '3a79376bb5c0f50863295b51544dbf811180682d':