Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 92bd012829  -s ours
am: ca6669ca12  -s ours

Change-Id: I7c701e2fc2685429ace363283466cea3f5f9b3a9