Fix cpu_for_optimizations cases

Change-Id: Iaace48d3267dd676f0716eaa94290fc903e7f4cb