Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: eb93f0668c -s ours
am: 659e607049 -s ours
* commit '659e60704920b7fafa865fef1a7262dd1994f1e6':
Import translations. DO NOT MERGE
Change-Id: Ib7772068baa3eaa1235eb17de0fb3470d8833083
This commit is contained in: