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

Change-Id: Ic2fa621fe775682d8c53da461f49021499c9fd26