DO NOT MERGE: Add validation for eternal enities am: b9002c1970 am: 91e8802c4b am: dddb2ecc56  -s ours am: e36f87461a  -s ours am: 8218c799d1 am: b5d6c21992  -s ours am: 7fc3e94771 am: 389104bd67 am: f906e415f6 am: f28e4921c8  -s ours am: 789b16bf31 am: 87facdc30a am: dbdf6e58ee am: b4f029041b am: d2a753cedd  -s ours am: 338e79db42
am: 15a9a24494

Change-Id: I2bf44a5d82ccbdca1b8677d54d7ee6fa60d2a9d0