am 1aebed36: Merge "assert recovery finger/thumbprints, not system"

* commit '1aebed3659ab3cfbed133981cbbc3b27d83ae9f5':
  assert recovery finger/thumbprints, not system