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

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