Merge "Clean up ASEC unmounting on physical storage." into klp-dev