update for hammerhead

Change-Id: I6e3e829716eca5d35a92c50b8bd22fa15b044a49