Updating DI to master and adding CLDR

Change-Id: I61bc80f257c590c1abeb716145c23921b005e5a8