am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev

* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
  Fix damage bug