Merge "rainier: remove cpu workaround for errata 1542419" into integration