Merge "Add some debugs to diagnose test failure." into tm-dev