Refactoring and mocking to make sure unit test doesn't call the real service

Bug: 180938364
Test: utest
Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
1 file changed