DO NOT MERGE: Add validation for eternal enities am: b9002c1970 am: 91e8802c4b
am: dddb2ecc56  -s ours

Change-Id: Ib8517552d4dfcd7443f008db320441db285c8bca