Merge "Break the debug cycle!"
am: 21fd1b7553

* commit '21fd1b755392ccbc0ad93e3e2ef08adad8fe9471':
  Break the debug cycle!

Change-Id: If890cd130b129bed1927fd950c9382bf52433459