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

Change-Id: Ifa3a8c0d7e1a5d0c6b4092d0b65abd3ea5497390