Align hammerhead device with CM

Change-Id: I5112c1d52090c9600dc040989a41ca2e51b56397