Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 61058919ca  -s ours am: 29246c2795  -s ours
am: 9e56c3b789  -s ours

Change-Id: Idb2c23fdd2fba229887d08fa65aaa839268af4a2