Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours
am: 9f2ffbcd66 -s ours
* commit '9f2ffbcd6674928818775002f15a1661d322aef1':
Change-Id: Idaf84d41a7aac1ed04b0abf97ca0449b53afaf89
This commit is contained in: