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

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