am d661f214: Merge "cherrypick:Fix longstanding EAS battery burner" into jb-mr1-dev

* commit 'd661f214c7a9a6142dff2d03944510aa5e6ee200':
  cherrypick:Fix longstanding EAS battery burner