Merge "Unbreak baremetal API tests that were not updated"