Merge "Revert "Update cloud image""