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