Merge branch 'gerrit/neo'

Change-Id: Ib1f7319d96e5d157fbcb226358d5e19444549aca