Merge "Consistent "low storage" behavior." into oc-dev
am: 552e3c4dba

Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966