DO NOT MERGE: Add validation for eternal enities am: b9002c19 am: 91e8802c am: dddb2ecc -s ours am: e36f8746 -s ours Change-Id: I484243f74f83a80b5258cfa38844cbefaedd3d88