Merge "Add secondary external storage support." into klp-dev