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