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

* commit '10abf9e38ffd91656092c3fbf59a41446fb796cd':
  Break the debug cycle!

Change-Id: I67c1ea5074babc681cedd3ce49df519ab151dc30