Prevent import of entities to avoid ID conflicts

Bug: 63228
Change-Id: Ie03b10dcb37feb5d038de1730e58daf00d2b49ea
Merge "Prevent import of entities to avoid ID conflicts"