am 6e14b22c: Merge "APIs for multiple external storage devices." into klp-dev

* commit '6e14b22cfe2ac923825d4b085e4e48b1fbd98f09':
  APIs for multiple external storage devices.