Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5  -s ours am: 9467382a44  -s ours
am: 2e2dfc94fc  -s ours

Change-Id: I7cec44bded9fcfe5267265a95986a228c6af6fd7