Merge "Cleanup debug options" into lmp-mr1-dev
automerge: b0aeaad

* commit 'b0aeaad442e6cd4920d75a63d65a91267cf9199a':
  Cleanup debug options