am 8d254fd4: Add override to force the CPU variant.

* commit '8d254fd40df498a21ca540cb355ee8c6a9250ac0':
  Add override to force the CPU variant.