Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: a1bde91384  -s ours

Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c