Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: bdc26bab6e  -s ours am: 142b734458  -s ours" into nyc-mr1-dev-plus-aosp
am: 26c00050d1  -s ours

Change-Id: I375a03d3d4a9c6253af615c1af5972aba294d6d5