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

* commit '20658cfb3cfc6206b8401ea74a4328cb8a3cfbdc':
  Assign specific types to userdata and cache block devices.