Merge "Change gerrit branches to beijing" into beijing