am 3c60d137: Merge "Fix soft reference clearing issue." into klp-dev

* commit '3c60d13761e245b74f862987b3eae7bd5fdda5f3':
  Fix soft reference clearing issue.