Merge "Fix intermittent failure in DataChangeListenerTest" into stable/helium