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

Change-Id: Ifb41402688d226dfc8755d2d334ba28deadfc295