Merge "TrivialFix: Remove pending deprecationwarning"