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

Change-Id: Idfa9d92b40fed386369d648a11d7f39695e3ba9a