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

Change-Id: I35d8c615ed3ccb600dd5a6e7d4ffca31f1193ae2