Merge "health.filesystem::IFileSystem -> health.storage::IStorage" am: b670abc941
am: d590b2357d

Change-Id: Ib1f97a00683e28b0f78661931ffd3ba317581d4c