Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: f2475c29e1 -s ours
am: 7b71c6095d -s ours
* commit '7b71c6095ddead961cf4da2c484f04dfcf714888':
Change-Id: I35d3845a38b4ef9eb5b93a02a98681f8cb319268
This commit is contained in: