Merge "API 29: Fix changed nullability"