Merge "Give DefaultContainerService all external storage." into jb-mr1-dev