[automerger skipped] Merge changes from topic "battery_current_sign" into...
[automerger skipped] Merge changes from topic "battery_current_sign" into rvc-dev am: 432974a6 am: 15629fd7 -s ours
am skip reason: Change-Id Ic5a714b830ffeca1dcd000c6cad0fbfe8a8710ed with SHA-1 94841c9d is in history
Change-Id: I30e2d0b49e29de961ef9267416ffef2373b8b77e