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

* commit 'b5a80a1eb89f621950aa9a93c0c6655a24c7cc96':
  Fix soft reference clearing issue.