Merge "Update airship jjbs"