Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7f1b86e5df
-s ours
* commit '7f1b86e5df66271371cd2e570b5a32c12cde7fee':
Import translations. DO NOT MERGE
Change-Id: I3ce02f9f42210188d909e48fce22a21ab53ee816
This commit is contained in: