Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e -s ours Change-Id: I6ca238a1467cf11050f28a8254beba786148b830