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

Change-Id: I5aa0d69c3749253467b896c787af1374d4920e7b