Change-Id: I2d60a2ccad325236998a7f9af9b4e82fe0c8131f
The ARM part is not finished yet and will be fixed in a later commit.