am 759d34cb: am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409"

* commit '759d34cbd051c61b9f18bdb6576a943997a28510':
  Revert "Debug for bug 18017409"