remove duplicate code

Change-Id: I60faf921de4b9add619e2450e0a19a111ede7984
2 files changed