Sync entitites file to other projects

Change-Id: I90413d6fb8e26514700734078d4a28d6bb8ba27b
Merge "Sync entitites file to other projects"