Refactor for server side usage. There is no funcational change. Bug: 128911090 Test: unit tests Change-Id: I84983d095ec70ba41325736f95235f09ece2c494
Refactor for server side usage. There is no funcational change. Bug: 128911090 Test: unit tests Change-Id: I84983d095ec70ba41325736f95235f09ece2c494