Merge "Let Shell modify secondary external storage." into klp-dev