Merge pull request #10609 from alpencolt/ryu-arm-locallock