Use the same EntityInfo for JS and HTML

Change-Id: I5feac8e2a8a4e33c7187fef6a88fd2517ad3b14f
Merge "Use the same EntityInfo for JS and HTML"