Refactor to use the utils class.

Bug: 298076922

Change-Id: I0085fdf7594d0ba9243a7b44600252d8c5b21608
2 files changed