clean up debugging code from b/6946182

Change-Id: Ic6605e5e0fc7ba555801c7c11f5cdd2141047541
9 files changed