Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2  -s ours
am: 85e1b30a61  -s ours

* commit '85e1b30a61c0da98a79ff6a5dc4faf0babd081e2':

Change-Id: Iebcf8d4966d03d0b6b6fae266f8e166f3c6cb4fb