Merge "Import translations. DO NOT MERGE" into nyc-dev am: aebe22dbc3 -s ours
am: 040776cc13 -s ours
* commit '040776cc136ce84dc8b27b623566cde51a01802b':
Import translations. DO NOT MERGE
Change-Id: I5bce6d25e95739e8329d9ed0c25584e760c95b32
This commit is contained in: