Update ARM with latest upstream changes.