am cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev

* commit 'cb094a783f14daae3378ac8aa7dc509980f037b2':
  New compile-time flags to make debugging easier for us poor souls Bug #7195815