am 8919753d: Merge "Assign specific types to userdata and cache block devices."

* commit '8919753d9c2db84bc916d331e9a2506ddb1e2b82':
  Assign specific types to userdata and cache block devices.