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

Change-Id: I2ce23cc2c4f84c7a7028d36fa12518e7c68d9617