Re-factor some duplicate code.

Change-Id: I89a1dbea39c50c7633f746d9c93fec3a289f1b42
4 files changed