Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1  -s ours am: 347f2b60b5  -s ours
am: 22eecbe274  -s ours

Change-Id: Ie62d911c8ebdd816b50c39a84cd31d481da089d2