Merge "Use Keymaster-friendly validity dates."