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

Change-Id: I484243f74f83a80b5258cfa38844cbefaedd3d88