Merge "[Trivial]Remove unused variable assignments"