am 7a397e04: Merge "Debug code for bug b/6830207" into jb-mr1-dev

* commit '7a397e0468310e75f39d93fadcd43b7224c9e0c5':
  Debug code for bug b/6830207