am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev

* commit '088bf3a37a329962efb5e5a42c82f32a2dab77fe':
  More debugging for bug 17721767