Merge "Use Add-To-Dictionary indicator only" into lmp-dev