Redundant code removal

Change-Id: I9ad1cec46e8ee4db7f7e2a887022457bc1ee601e
Merge "Redundant code removal"