am ccfe6bd4: Merge "Remove unused local field." into lmp-mr1-dev

* commit 'ccfe6bd479acc41e018bd38c4021614dc9326fbf':
  Remove unused local field.