am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."

* commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6':
  Fix recovery mode.