Merge "bvb: Update path to key since repo was moved."