Merge changes from topic "cherrypicker-L46000000956655097:N14000001299785468"

* changes:
  [automerged blank] Remove debugging code. 2p: b9c2fe1af6
  Remove debugging code.