am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev am: 78515faff0

Original change: undetermined

Change-Id: Ie315b950439875f6dd077f78c68b5f9907f9cf84