Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 3cfbe6e7ea -s ours
* commit '3cfbe6e7eaa40f28f6550a3dcaffe7cdc6eac121':
Import translations. DO NOT MERGE
Change-Id: I4a2f25168a33676c7caf95765c004c71c333ecd8
This commit is contained in: