Merge "health 2.0 vts: Allow for battery-less devices" am: c9d0f25cfa am: 425f44da54 am: afb2dc8a41

Change-Id: I6023d7e975799ccbed31169d4009e9e14255a841