[automerger skipped] Merge "health.filesystem::IFileSystem -> health.storage::IStorage" am: b670abc941 am: d590b2357d
am: 4dd013fbbc  -s ours

Change-Id: I355005cfeb266227eee5db81dc20866238d11f5b