Merge "Protect runtime storage mount points." into mnc-dev