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

Change-Id: Ic61aa582af2cd6e0d6249a1ef261c1b6bfeea9d1