Merge "Only destroy the storage area that had trouble." into oc-mr1-dev
am: 9aa5b26aed

Change-Id: I18e3a2797321c97e92d9cfd0e09b3c41e2e51683