Merge "Fix 2 instances of a field being assigned itself in a constructor." am:...
Merge "Fix 2 instances of a field being assigned itself in a constructor." am: f28ab805 am: b3ad81b7
am: 7f0b5f75
* commit '7f0b5f75':
Fix 2 instances of a field being assigned itself in a constructor.
Change-Id: I141ae59400cb044d4a9f21ed28148b3499b49da8