Also delete confusing debug variable. Bug: 25459795 Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8