Merge "Fix logging for debug build." into devel/master