Remove redundant value assignment

Also redistribute variables over 2 lines instead of 3.

Change-Id: I4127173f84ef59d4de2199ff45b52243c761a87d
Merge "Remove redundant value assignment"