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

* commit 'ce44059861254b44c0ccd39ed40673e02797160a':
  Debug code for bug b/6830207