DO NOT MERGE: Add validation for eternal enities
am: b9002c1970

Change-Id: I06a0dc99b0df3a41b616137f2160ae4e8095eee3