Looks like this fixes all HACKING problems that were around. Thanks to Dina Belova and Alexander Kovalev for this work. Change-Id: I63ae1ab2f1bb37daa236cde4096c3c893fd80dd2