Merge "Fix redefinition related use-after-free bug"
am: 81c769436a

Change-Id: I95966276ed83b7faf5d4e7c9b8e914d745388453