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