DO NOT MERGE: Add validation for eternal enities am: b9002c19 am: 91e8802c am: dddb2ecc -s ours am: e36f8746 -s ours am: 8218c799 am: b5d6c219 -s ours am: 7fc3e947 am: 389104bd am: f906e415 Change-Id: Ia1a29d298e25fe64a9e589710443a576c674ec6c