(Bug 45881) Stop use of entity ids with wrong prefix

It seems to me that this fix is sufficient and it is only the explicitly given entity id that is misinterpreted.

Change-Id: Iafaca93b79d5ee2d7b9cd72d2a24fae5ba0f8d51
Merge "(Bug 45881) Stop use of entity ids with wrong prefix"