Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours am: 3551359739 -s ours
am: 8bd9f06370 -s ours
* commit '8bd9f063704d8502c9e3f77d9147f99deeed55d3':
Change-Id: I17a8d3090a71871e585757259230e255e6b57cfe
This commit is contained in: