Merge "Correct getExtras("satellites")" into udc-dev