am c7c8b069: Merge "Cleanup debug options" into lmp-mr1-dev automerge: b0aeaad automerge: 49a01fc

* commit 'c7c8b069407236bcc04c086912c73002d48419ef':
  Cleanup debug options