am 5b74affd: Merge "Assign specific types to userdata and cache block devices."

* commit '5b74affd6b9e32d77a9bcb986c9ca50a3f8754d3':
  Assign specific types to userdata and cache block devices.