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

Change-Id: I9e318844e2c78e80d9fe7e0a53b1ca6f751758de