Merge "Stop sign-extending RS IDs." into lmp-dev