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

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