More product debugging.

Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
2 files changed