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

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