Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c27bf8ea68
-s ours
* commit 'c27bf8ea680f3319a44a1b9c2dda480d7836c575':
Import translations. DO NOT MERGE
Change-Id: I84660ff25a0f6d211d967920fadadb3aa981ef0c
main
commit
3f27b4a747