hercules: update branches

Change-Id: I1877de9c406d08fdb38789130aa82bbfab771598