Merge "APIs for multiple external storage devices." into klp-dev