Merge "Improve running time of SatelliteManagerTestOnMockService" into udc-qpr-dev