Remove redundant assignments

Change-Id: Ia9043b6abbb5c9239fb1511a6bf0b9e8555ba403
Merge "Remove redundant assignments"