Use the same EntityInfo for JS and PHP

Change-Id: I8d315d039cd1145b430cc3bc108f5b9b6e1c5533
Merge "Use the same EntityInfo for JS and PHP"