Merge "Bug 1283: Made return types of AsyncDataChangeEvent consistent"