Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev