satellite fix

Change-Id: I2ec7729db24819047e95af2ca92ccb92af15a3c7
Merge "satellite fix"