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