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

Change-Id: Id1d483432156393888f0a667a9f030c0caa4f822