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

Change-Id: I5ae0041bcc7f9e1fafb3441add57e6491d6378f6