Merge "health.storage: Add VTS test." am: 10becafa1e am: d24a61d2cf
am: 7dc4fa2053

Change-Id: Ic1bb8107216b5a3bc8b74f1743979677dece2c32