Merge "More debugging for bug 17721767" into lmp-mr1-dev