Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8437fce56d  -s ours
am: 31cde3cd69  -s ours

Change-Id: I636155c833b1b3c0201896665bf97799a3746e59