Revert^2 "Refactor Satellite APIs"

542793e750833b8a6719f4abdcffae008e8bfa5b

Change-Id: I0a7e4ab061824d2da24a42cad83af6c5c074241e
2 files changed