[automerger skipped] Merge changes from topic "healthd_vts_skip" into pie-vts-dev am: a35c8253db
am: b77950c850 -s ours
am skip reason: change_id I8df1154d8a94a67ae28e8024de6022fcfe76384d with SHA1 03b2a3477b is in history

Change-Id: I2eb8ad9423a80d0cdd078c79567d7bb9e4132d04