Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4f6d64ea0d  -s ours am: 331cc39563  -s ours
am: a1bcb2fb67  -s ours

Change-Id: I396c5a7318f1e7452d02c1b67c42b46c765155e8