Merge remote-tracking branch 'origin/users/hjl/linux/master' into users/hjl/linux/applied