Merge changes from topic "healthd_vts_skip" into pie-vts-dev
am: a35c8253db

Change-Id: I008e46aa0bcdf2e31de18fe9329f332b4e959999