Merge "Remove the max ripple count exceeded warning" into lmp-dev