Controlled Logging!

Change-Id: I33b8502a045effa7ce9d9844a13c26a1c440b08e