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