Merge "Avoid NPE when fsUuid is null." into mnc-dev