Merge "Turn this wtf into just a log." into nyc-dev
am: 1755dd08cb

* commit '1755dd08cbcdd2ffb14ac2eb84edc663843ced24':
  Turn this wtf into just a log.

Change-Id: I6e4a129e2ba7ea6d23e5d3a07b120278a373ed10