Merge "airship update upstream test status"