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 Change-Id: Ibe141d4e658c20e434b04249fddabeb58f54beba