branched gerrit 2.5.X

Change-Id: I31d21dc05bb381ac5eac1bcccaf03eb04964cf5e