am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev

* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
  More debugging for bug 18201239.