Merge "Delete product specific mini-debug code"