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

Change-Id: I36cabf807334dfb6022e20f652e5232b03458f45