Merge "health VTS: split Properties test" am: f8a8873ee6 am: 884b2e29f1
am: b553561fee

Change-Id: I90475715a6a6d06823580a3e55379ba04b83dd3d