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