Add simple-force-redefine agent am: 74ab975b65
am: 48bd41d054

Change-Id: I125e7bb4920cd5e098daeab9f1ddc292d5296a1c