Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 6ade653254  -s ours
am: a7be68f24e  -s ours

Change-Id: I597b365571cd31f60d68024e66dbf75bad619d15