Merge "Non-blockable notification packages." into nyc-mr1-dev am: 7ca068feeb am: dd8b1df0cb
am: e8c70bd3b5

Change-Id: Ia77c749d4255e7aeda1974f46210db4bf752724b