Merge "Cleanup debug options" into lmp-mr1-dev