am 9860dcdf: (-s ours) am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into klp-dev

* commit '9860dcdf427d70e6aef4ce082be40a5459c466f4':
  DO NOT MERGE NuCachedSource2: fix possible erroneous early free