Restore over aggressive deletions from ag/305620. Also remove over specification of debug member variables. Change-Id: Id637d0dbece169d27271aabd714d34d449bfb050
Restore over aggressive deletions from ag/305620. Also remove over specification of debug member variables. Change-Id: Id637d0dbece169d27271aabd714d34d449bfb050