Null merge branch 'gerrit/trinity' into 'master'

Merge (-s ours) gerrit/neo merge commit into gerrit/trinity,
previously merged into master

Change-Id: I28ed082475de2bb311775eae95f8678d533e6ff1