Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 94744459d2  -s ours am: 0a3392d146  -s ours
am: 0450b46ad4  -s ours

Change-Id: Ie764ac5d49cba578c92f6164302b39f7c29fae1e