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

Change-Id: Idb692e7e818bda7579a7a0d8533e74df2e8952b6