DO NOT MERGE: Add validation for eternal enities am: b9002c19 am: 91e8802c am: dddb2ecc -s ours am: e36f8746 -s ours am: 8218c799 Change-Id: Ia909a647e9a6751958aac52762022e48c4c43336