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 am: f28e4921 -s ours am: 789b16bf Change-Id: I7ba275cb8ca4f8751e29293792277240558c296d