Merge "DO NOT MERGE remove frame drop check from lmp-dev" into lmp-dev
automerge: 65a4bf3  -s ours

* commit '65a4bf31924cfcd8737e8cb4ff8d37feeb21b2ce':
  DO NOT MERGE remove frame drop check from lmp-dev