Hercules: Prep for going official

Change-Id: I04b458e0f89da117c15a5069c995fe8a9f1907ae