code clean up - to remove dup code.

Change-Id: I75377aa403be424af514e7f8198bd481a7051f3e
2 files changed