am 3745efd1: Merge "Check return codes in softkeymaster."

* commit '3745efd184f9989137289b8a6fcb32afc308f94a':
  Check return codes in softkeymaster.