Merge "Do not fail when jack server can not be updated"