am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

* commit 'c16d9de72996950ec7f55af80d2864cd2abad1c2':
  fix NPE in race condition.