Merge "Handle FetchResultHandler race condition." into mnc-dev