Replace simple variable usage

Change-Id: I06b2556e65e8e4f429aecf03c65d9ea604d95c9f
Remove unused local variable assignment

Change-Id: Icd031e3173ac806e80bdd7d74b4e71877d258822
Merge changes Icd031e31,I06b2556e

* changes:
  Remove unused local variable assignment
  Replace simple variable usage