Add debug parameter

Change-Id: I709ca9c83c8b25f7ecc8b6f401bad5760d8bbc8a