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

Change-Id: Ifbbc236c8b4db414a0203183a66efe3d3100d6c6