Revert debug commits

This reverts commit 3c67bdc6ac71c042fbb3d119546a323fb27af6a3.
This reverts commit 653a8c78b85f6a911563ac3871901c6ecc66d357.
This reverts commit 46d2873acc0ce3938e55152682816f8a55824fd7.
This reverts commit 3b71c7c3fc92b12f008a680903b1146711567d34.

Change-Id: Ia84879e89e2d5b04b134525c767dfa4043ff6445
3 files changed