Merge "Fix redefinition related use-after-free bug" am: 81c769436a am: 86f9beff2a
am: 1b577465d2

Change-Id: Idf014c8209bec9e44d4680479ff9f19662c3c895