Update SPR-9925 to latest 3.2 snapshot

Update maven dependency to 3.2.2.BUILD-SNAPSHOT and remove duplicate
classes.