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