Merge "Remove unnecessary variables"
am: 2eb45d9ab2

* commit '2eb45d9ab29b0923aeeea51ae0c58e32fea23941':
  Remove unnecessary variables

Change-Id: I645c34edb93ce262d245867c4efea2d409366a09