Merge "Break the debug cycle!" into nyc-dev
am: 0faf1514b5

* commit '0faf1514b5b59a809539f003c5915db9bb0ff03e':
  Break the debug cycle!

Change-Id: Iaa628b89986bc02e517126aa071aa19219b34c77