Merge "Test new READ/WRITE_EXTERNAL_STORAGE behavior." into klp-dev