Merge "Fix incorrect notification about running out of storage space." into nyc-mr1-dev