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