There were some changes in x86 Simply built off m-p-d
which should be propagated into ARM Simply built off m-p.