Hercules: Upstream to CM

Change-Id: I089afe48ae632823abf2892d0c97524f2a10877e