Remove unnecessary assignments

Change-Id: I7890b296474811b16f57e029f9142655df1bc945
15 files changed