Merge "Fix notification ordering for groups" into oc-mr1-dev
am: 03eb6c9934

Change-Id: I83921013d25ab54b2d67258bd15c99d879d26185