Merge "Clean cherry-pick: Fix a crash reported by monkey tests." into lmp-dev