Reorder UserEditFilterGenerator in right place

synchronized with core

Change-Id: I46e88b7e0313c0f1c4560b74c2c9208b828868fc
Merge "Reorder UserEditFilterGenerator in right place"