Merge "health VTS: split Properties test"
am: f8a8873ee6

Change-Id: I4a951a54f052e8f1891e4aeb406307c59f25d3e3