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

Change-Id: I83c25a2b0f73b6f98fad3743fd8c494ceaf5a02d