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