Fix redefinition causing corrupt j.l.r.Field objects am: 163652e59b am: a907c39991

Change-Id: I2a2890ef7382e4f9c9a7af7d30fd0e0e46527f69