Merge "fix NPE in race condition." into ics-mr1