am 04047af6: Merge "Use Keymaster-friendly validity dates."

* commit '04047af628338aa7859ae1f24700e1e4e3ae63e7':
  Use Keymaster-friendly validity dates.