am 98e2c509: am 78aa50d3: Merge "recovery: Handle EV_SW events"

* commit '98e2c509a636db7c4d9a89c086e8d4ac03a6970b':
  recovery: Handle EV_SW events