Merge "Do not use macros from MediaDebug"