am 4821c01e: am fc691d91: Merge "Reduce keymaster digest list to required set."

* commit '4821c01e1c6bcb117cea0b59d976b23bf3664972':
  Reduce keymaster digest list to required set.