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

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