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

Change-Id: I6b74df99021a780f70c8bbb07e68d58f19e8b163