Remove code duplication

Change-Id: I428677343fe71aded4156e5fc9b84a9d994a6bae
1 file changed