updated things for gerrit

Change-Id: Iabb21b31842699ff32b6725aedc18b65422109f5