am 1388342c: am 088bf3a3: Merge "More debugging for bug 17721767" into lmp-mr1-dev
automerge: 07d2f0c

* commit '07d2f0cff4d08bec4ff5ea22f9c42532f3c83e35':
  More debugging for bug 17721767