Moving some utility methods around

Change-Id: I8abca49a0dbf656212b21e0552502036a1619164
8 files changed