Merge from push event notification test 4c8482fef0862580