Merge "Revert "Upgrade and reinforce ThrowingConsumer""