Merge "Improve external storage CTS tests." into jb-mr1-dev