Remove variable assignment that appears twice

Change-Id: I5f775b04f46ce94a580969fdc54b0603ae45a28a
Merge "Remove variable assignment that appears twice"