Be a bit more aggressive with storage checks.

Bug: 27974011
Change-Id: I9f6d604fbc06f4368170b0cabec30a25aa95c514
3 files changed