am 66b96b59: am 78014a78: am 04047af6: Merge "Use Keymaster-friendly validity dates."

* commit '66b96b59774838998b1e67f83f3d67be5cc3a3e2':
  Use Keymaster-friendly validity dates.