Hercules: Updates for 4.4

Change-Id: I781a95e14a69e72cd6510badeb4b4e91b820747b
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>