Rename instead of writing directly to revoked file

Make the operation more atomic with multiple writers.

Closes-Bug: 1261554
Change-Id: I990a2ba28d9a2a1d01300dcd33266956d059afa3
Merge "Rename instead of writing directly to revoked file"