Merge "Bump upstream dependencies to P-SR1"