Merge "Generate stable MTP storage IDs." into mnc-dev