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

Change-Id: Ibdefb4be53853b4fdb135ec3fdcf44a78a2e2208