Merge "fix compile error from cherry pick." into lmp-dev