am 42a70b67: Merge "Enhance keymaster tests"

* commit '42a70b67abf0fce9c0f898c92a6e3c36e92773e9':
  Enhance keymaster tests