Allow id and type params in wbeditentity data!

Bug: 54146

Change-Id: I379b280bdf398c4cf35284469bbbfa9ee7877084
Merge "Allow id and type params in wbeditentity data!"