am f7855cd8: Merge "Assign specific types to system and recovery block devices."

* commit 'f7855cd86152ee5e9b3ec7033b759b85fa4fb989':
  Assign specific types to system and recovery block devices.