Merge "reset: Use correct scm id for pshold"