trunk-tracking: update to build with mps r3537

This makes us compile and updates the tests for