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

Change-Id: I8a2328710d4bc770badfcc9778534fccaaf91405