bring international up to speed

Change-Id: I82b40631e1bb26ae12acab1c05f8a6c9cd097543