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

Change-Id: I9f51b631fec9cf1e6f67e0a4a5028749fbc9e9ee