Merge "Fix for issue 20051601 - ARM instruction alignment."