Rebase and add in Hammerhead

Change-Id: I0a6e1210a3798a5f7be23195c8a8d590d86e75d9