Merge "Fix the path for verity_key replacement when signing." into nyc-mr1-dev