Revert "Revert "Gerrit Test""

This reverts commit e88822ddf85ebde3c92c91e9f932cd9e9b7b6588

Change-Id: I8ab850abc2168ea25fe3ef8ad346b14b7d31c17f