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

Change-Id: Ic54b29721d4279c35be5aec205277c415441348e