Merge "Cleanup of redefinition testing"
am: b53347ee64

Change-Id: Id292feb565060ff59196dd98ba392eab93890423