Also add a compile-time assert to make sure this doesn't accidentally break again in the future. Change-Id: I4d18cfbf21392291e1bdd76eff055429009d28d6 Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>