Merge "GetActiveNotifications should never return null" into pi-dev am: 66dfd01292
am: a643f89ce1

Change-Id: I6ab090f262e819babc334a9c1a41bc1cb4920c2e