Merge "Don't test pw_shell for old vendor images"