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

Change-Id: Ib1898eff9b5f773bba765b1a88bb1fbd31e4883d