Merge "Debug for bug 18017409" into lmp-mr1-dev