add gerrit

Change-Id: Iee1aed359567cbcbe3a6025711fbc59b31ea3e27
Merge remote-tracking branch 'origin/jb-mr2' into jb-mr2