[Changed] Removed/Added Some Trainers

Change-Id: I6cb879cc792e46378e19eb62287506bf3f63fa1c
Merge "[Changed] Removed/Added Some Trainers" into unstable