New gerrit port

Change-Id: Ia7e8d99833d7d366f2a8c70bddf9740c1d0f19d2
Merge remote-tracking branch 'upstream/kk' into fjcarbon