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

Change-Id: Ic87bc0ec27bb3a4a517b3ba09539ca7cd08b8c8a