am d400d03f: Merge "Fix issue #5595933: GREF leak due to race condition in..." into ics-mr1

* commit 'd400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
  Fix issue #5595933: GREF leak due to race condition in...