Merge "Even more debug for bug 17721767." into lmp-mr1-dev