Revert^2 "reflect the refactoring for satellite API"

60b3b4ab1935447e825747a34fdd7b04c954ce23

Change-Id: Ibf3739869f4fa988bbc23c1ba7cee382fe069d2d
1 file changed