Merge "Updated the policy file associated with riscv64"