Merge "Add health 2.1 to vts-core." am: 4395bb1d74 am: 79329fefb5 am: 0f0ca47d87

Change-Id: I38ab03cdafbc79d11716afbde5e034f27dabe3da