Merge "Add gerrit-acceptance-tests"