Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 6d160e9b8d -s ours
* commit '6d160e9b8d260c1609e6df05215a6b6300ae6fe9':
Import translations. DO NOT MERGE
Change-Id: I903b1bca7bb9fa9f8ffd34a70292bc94ab6d591c
This commit is contained in: