Merge "Changed default gerrit checkout branch, fixed gating"