Revert "Logging to track #36406078" am: 759922d9db
am: 54fa5e0839

Change-Id: I565f65d44649615cdfe80524c02c7c360fc8d37d