Update hacking

Change-Id: Id38a862f4a4ba8f661431fcc09d285d50f83623e
Merge "Update hacking"