Merge "Non-blockable notification packages." into nyc-mr1-dev