Merge "Replace deprecated InstrumentationRegistry (2/n)"