Merge "Consistent "low storage" behavior." into oc-dev am: 1e4088fc68
am: 666ff7278b

Change-Id: Ifeab043cb89ce953845a6db67cde1100ec7f715d