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

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