hammer: update from 5.0 final

Change-Id: Idb80be65857d2dd45c9884bd0de6eac85b59ad5f