Merge "Fix a bug in adding one-digit policy-version in metadata"