Reduce code duplication

Change-Id: I6ea1c335da9ca5b65f6a11466b417ad196fd0d65
1 file changed