Merge "Revert "Debug for 13924095."" into lmp-dev