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

Change-Id: Id0584f9db9c636f28aad3b92bbda90a189ea7295