Merge "Fix health.storage test" am: 5adcaebd8c

Change-Id: I98bb28cff68ea4a25e81e236cd577fa79d5dc7e5