Remove redundant code
am: 4ebc5986a8

Change-Id: I16ea5561f915a45407a2a9219604359781267cc3