Merge "Fix failing sdk tests."